From de466e7b286613ba0e7a4d864cfa6a0156ebb2e5 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Sun, 20 Mar 2016 23:37:40 +0100
Subject: [PATCH] Adwaita: rework places sidebar styling

set colors on rows istead of images.
---
 gtk/theme/Adwaita/_common.scss           | 16 ++++++++--------
 gtk/theme/Adwaita/gtk-contained-dark.css | 12 ++++++------
 gtk/theme/Adwaita/gtk-contained.css      | 12 ++++++------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 3b5692a0f4..ae2cd6dcbf 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3671,19 +3671,19 @@ placessidebar {
       padding: 0 14px;
     }
 
+    &:disabled { color: $insensitive_fg_color; }
+
+    &:backdrop {
+      color: $backdrop_fg_color;
+
+      &:disabled { color: $backdrop_insensitive_color; }
+    }
+
     image.sidebar-icon {
       opacity: $_placesidebar_icons_opacity; // dim the device icons
 
       &:dir(ltr) { padding-right: 8px; }
       &:dir(rtl) { padding-left: 8px; }
-
-      &:disabled { color: $insensitive_fg_color; }
-
-      &:backdrop {
-        color: $backdrop_fg_color;
-
-        &:disabled { color: $backdrop_insensitive_color; }
-      }
     }
 
     &:selected image.sidebar-icon { @extend %nobg_selected_items; }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index c6d2c6386c..d278f7bc2e 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3800,18 +3800,18 @@ placessidebar row {
   padding: 0px; }
   placessidebar row > revealer {
     padding: 0 14px; }
+  placessidebar row:disabled {
+    color: #949796; }
+  placessidebar row:backdrop {
+    color: #949796; }
+    placessidebar row:backdrop:disabled {
+      color: #5d6767; }
   placessidebar row image.sidebar-icon {
     opacity: 0.7; }
     placessidebar row image.sidebar-icon:dir(ltr) {
       padding-right: 8px; }
     placessidebar row image.sidebar-icon:dir(rtl) {
       padding-left: 8px; }
-    placessidebar row image.sidebar-icon:disabled {
-      color: #949796; }
-    placessidebar row image.sidebar-icon:backdrop {
-      color: #949796; }
-      placessidebar row image.sidebar-icon:backdrop:disabled {
-        color: #5d6767; }
   placessidebar row label.sidebar-label:dir(ltr) {
     padding-right: 2px; }
   placessidebar row label.sidebar-label:dir(rtl) {
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 5a40f39558..f16f60464f 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3828,18 +3828,18 @@ placessidebar row {
   padding: 0px; }
   placessidebar row > revealer {
     padding: 0 14px; }
+  placessidebar row:disabled {
+    color: #8b8e8f; }
+  placessidebar row:backdrop {
+    color: #8b8e8f; }
+    placessidebar row:backdrop:disabled {
+      color: #c3c3c0; }
   placessidebar row image.sidebar-icon {
     opacity: 0.7; }
     placessidebar row image.sidebar-icon:dir(ltr) {
       padding-right: 8px; }
     placessidebar row image.sidebar-icon:dir(rtl) {
       padding-left: 8px; }
-    placessidebar row image.sidebar-icon:disabled {
-      color: #8b8e8f; }
-    placessidebar row image.sidebar-icon:backdrop {
-      color: #8b8e8f; }
-      placessidebar row image.sidebar-icon:backdrop:disabled {
-        color: #c3c3c0; }
   placessidebar row label.sidebar-label:dir(ltr) {
     padding-right: 2px; }
   placessidebar row label.sidebar-label:dir(rtl) {
-- 
2.30.2